Revision: tlacontrib--bulb--1.2--patch-41
Archive: bulb@ucw.cz--pub-1
Creator: Jan Hudec <bulb@ucw.cz>
Date: Sat Apr 24 23:54:42 CEST 2004
Standard-date: 2004-04-24 21:54:42 GMT
New-patches: bulb@ucw.cz--pub-1/tlacontrib--bulb--1.2--patch-41
    jblack@inframix.com--2004/tlacontrib--devo--1.2--version-0
Summary: Big merge. Will continue on --1.3 anyway.
Keywords: 

Patches applied:

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-73
   Added some status messages to star-merge-undo

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-74
   cdiff, plus fixes for cvs-sync-inventory, tree-revision (bulb)

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-75
   Improved error handling in aba merge

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-76
   added colorize filter

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-77
   Fixed conflicts display for colorize and conflicts

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-78
   Fixed "conflicts" for whitespace and hidden files

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-79
   Fixed aba so it doesn't try to execute directories (!)

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-80
   Modified aba-lib so scripts can be stand-alone

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-81
   Fixed the 'don't execute a directory' fix

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-82
   Tweaked the conflicts command to resemble tla output more

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-83
   Made merge do a log-for-merge even if there were conflicts

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-84
   Merge w/ jblack

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-85
   Updated merge to support multiple merge-sources

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-86
   Added C file handling to tagline

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-87
   Made link-breaking part of aba-lib, applied to file-revert

 * ddaa@ddaa.net--2004/tlacontrib--ddaa--1.2--base-0
   tag of jblack@inframix.com--2004/tlacontrib--devo--1.2--patch-29

 * ddaa@ddaa.net--2004/tlacontrib--ddaa--1.2--patch-1
   tlash -- bash environment for tla

 * jblack@inframix.com--2004/tlacontrib--devo--1.2--patch-30
   Added tlash (Allouche)

 * jblack@inframix.com--2004/tlacontrib--devo--1.2--patch-31
   Integration with tla-sh, other aba improvements (Bentley)

 * jblack@inframix.com--2004/tlacontrib--devo--1.2--version-0
   This version is Dead\! Dead I tell ya\! Go to 1.3 instead\!

